bitkeeper revision 1.1236.12.2 (422d7345zz9yYZNfSXyhxHfWMIfkPA)
authorvh249@airwolf.cl.cam.ac.uk <vh249@airwolf.cl.cam.ac.uk>
Tue, 8 Mar 2005 09:41:25 +0000 (09:41 +0000)
committervh249@airwolf.cl.cam.ac.uk <vh249@airwolf.cl.cam.ac.uk>
Tue, 8 Mar 2005 09:41:25 +0000 (09:41 +0000)
Merge airwolf.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into airwolf.cl.cam.ac.uk:/auto/homes/vh249/xen-unstable.bk


Trivial merge